From 38ad068d9b312f4162cd0285dee29c899a968bbd Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 17 Mar 2021 11:09:37 +0800 Subject: [PATCH] GDK-Win32: Remove extraneous call to _gdk_win32_append_event() Apparently, by comparing with the other backends, we should not call _gdk_win32_append_event() after calling gdk_scroll_event_new() but we should call it after calling gdk_scroll_event_new_discrete(), which was why we didn't restore the cursor after we scroll using the mouse wheel and didn't manage to remove the shade that appears after we scrolled to the very top or very bottom. Also, as suggested by the reporter, use IDC_SIZEALL for the system cursor that we fall back to if no cursor theme is installed, as with other Windows programs. This should really fix issue #3581. --- gdk/win32/gdkcursor-win32.c | 2 +- gdk/win32/gdkevents-win32.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c index fe9f299c71..61cf9d83a1 100644 --- a/gdk/win32/gdkcursor-win32.c +++ b/gdk/win32/gdkcursor-win32.c @@ -61,7 +61,7 @@ static DefaultCursor default_cursors[] = { { "text", IDC_IBEAM }, { "move", IDC_SIZEALL }, { "not-allowed", IDC_NO }, - { "all-scroll", IDC_ARROW }, + { "all-scroll", IDC_SIZEALL }, { "ew-resize", IDC_SIZEWE }, { "e-resize", IDC_SIZEWE }, { "w-resize", IDC_SIZEWE }, diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 9c47263f07..5a17522ae1 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2485,8 +2485,6 @@ gdk_event_translate (MSG *msg, delta_y, FALSE); - _gdk_win32_append_event (event); - /* Append the discrete version too */ direction = 0; if (msg->message == WM_MOUSEWHEEL) -- 2.30.2